[TOOLS] Provide common LFS CFLAGS/LDFLAGS additions in Rules.mk.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 6a5036b3f688102b96ff68d78dcf55f082ed4caf..b676b423b97d42d90ca6a4122e5bb5db1e7a3eac 100644 (file)
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -14,6 +14,11 @@ X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
 
 CFLAGS += -D__XEN_TOOLS__
 
+# Enable implicit LFS support *and* explicit LFS names.
+CFLAGS  += $(shell getconf LFS_CFLAGS)
+CFLAGS  += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+LDFLAGS += $(shell getconf LFS_LDFLAGS)
+
 %.opic: %.c
        $(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
 

diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile
index e1324063e6a4d28cb0325a4589e70c9030e1b759..13ff93e1f8ffa67d5313266383f231e7edee7dd4 100644 (file)
--- a/tools/blktap/drivers/Makefile
+++ b/tools/blktap/drivers/Makefile
@@ -13,7 +13,6 @@ CFLAGS   += -Wno-unused
 CFLAGS   += -fno-strict-aliasing
 CFLAGS   += -I $(XEN_LIBXC) -I $(LIBAIO_DIR)
 CFLAGS   += $(INCLUDES) -I. -I../../xenstore 
-CFLAGS   += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS   += -D_GNU_SOURCE
 
 # Get gcc to generate the dependencies for us.

diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index 5596410f96364f2710072b45972ff053276b4d28..a4880d44cc3fcef0a410e6ec97061af2a84d7d87 100644 (file)
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -17,7 +17,6 @@ SRCS     += xenbus.c blkif.c xs_api.c
 CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
 CFLAGS   += -fno-strict-aliasing -fPIC
-CFLAGS   += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 # get asprintf():
 CFLAGS   += -D _GNU_SOURCE
 

diff --git a/tools/ioemu/Makefile.target b/tools/ioemu/Makefile.target
index 2ca5ce74bbfc33b6f79b1d6b17c1a29dae96966f..e3ea0c7e7b9bdeef5069ea91d0c872ad9f957114 100644 (file)
--- a/tools/ioemu/Makefile.target
+++ b/tools/ioemu/Makefile.target
@@ -177,7 +177,8 @@ endif
 
 #########################################################
 
-DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+DEFINES+=-D_GNU_SOURCE
+#-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 LIBS+=-lm
 LIBS+=-L../../libxc -lxenctrl -lxenguest
 LIBS+=-L../../xenstore -lxenstore

diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk
index 9fd15de4ce2306885762ba85da4f0db572b1e913..9d49c6373d085cad371670441b1181a491fccb48 100644 (file)
--- a/tools/libfsimage/Rules.mk
+++ b/tools/libfsimage/Rules.mk
@@ -2,7 +2,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 DEPS = .*.d
 
-CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -Wp,-MD,.$(@F).d
+CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror -Wp,-MD,.$(@F).d
 LDFLAGS += -L../common/
 
 PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))

diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index 98c43d58585db428f667a7911a1864ad43dde31d..6efce44f02f5fe475b6698cbbe1dae81ab529eca 100644 (file)
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 MAJOR = 1.0
 MINOR = 0
 
-CFLAGS += -Werror -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -Wp,-MD,.$(@F).d
+CFLAGS += -Werror -Wp,-MD,.$(@F).d
 DEPS = .*.d
 
 LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS

diff --git a/tools/misc/lomount/lomount.c b/tools/misc/lomount/lomount.c
index 7b86683bef4783f3becf0cebd00b5376d6c66a3e..74859e67ec4f1eb81d91efa680ddb9e6bb2e09bc 100644 (file)
--- a/tools/misc/lomount/lomount.c
+++ b/tools/misc/lomount/lomount.c
@@ -44,8 +44,6 @@ enum
        ERR_MOUNT               // Other failure of mount command
 };
 
-#define _LARGEFILE_SOURCE
-#define _FILE_OFFSET_BITS 64
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index eafc5bba850f91d209a17650130261f4e9f169f9..ce8e4904a8b7ba74899293eb180ff8121aaac34d 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -1,7 +1,7 @@
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS  += -Werror -D_LARGEFILE64_SOURCE
+CFLAGS  += -Werror
 
 CFLAGS  += -I $(XEN_XC)
 CFLAGS  += -I $(XEN_LIBXC)